From: Colin Walters <walters@verbum.org>
Date: Mon, 2 Jun 2014 19:27:40 +0000 (-0400)
Subject: Move Makefile.dist-packaging under packaging/
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~1186
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=93c68083ac68c87627a1b4fb43510fa064260320;p=ostree.git

Move Makefile.dist-packaging under packaging/
---

diff --git a/Makefile.dist-packaging b/Makefile.dist-packaging
deleted file mode 100644
index 75a52f6d..00000000
--- a/Makefile.dist-packaging
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- mode: Makefile -*-
-
-GITREV = $$(git describe --always --tags)
-GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
-
-srcdir=$(shell pwd)
-PACKAGE=$(shell basename $(srcdir))
-
-PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
-
-dist-snapshot:
-	set -x; \
-	echo "PACKAGE=$(PACKAGE)"; \
-	TARFILE_TMP=$(PKG_VER).tar.tmp; \
-	echo "Archiving $(PACKAGE) at $(GITREV)"; \
-	(cd $(srcdir); git archive --format=tar --prefix=$(PKG_VER)/ $(GITREV)) > $${TARFILE_TMP}; \
-	(cd $$(git rev-parse --show-toplevel); git submodule status) | while read line; do \
-	  rev=$$(echo $$line | cut -f 1 -d ' '); path=$$(echo $$line | cut -f 2 -d ' '); \
-	  echo "Archiving $${path} at $${rev}"; \
-	  (cd $(srcdir)/$$path; git archive --format=tar --prefix=$(PKG_VER)/$$path/ $${rev}) > submodule.tar; \
-	  tar -A -f $${TARFILE_TMP} submodule.tar; \
-	  rm submodule.tar; \
-	done; \
-	mv $(PKG_VER).tar{.tmp,}; \
-	rm -f $(PKG_VER).tar.xz; \
-	xz $(PKG_VER).tar 
-
-srpm: dist-snapshot
-	(cd $(srcdir)/packaging; \
-	 cp ../$(PKG_VER).tar.xz . ; \
-	 sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > $(PACKAGE).spec; \
-	 ./rpmbuild-cwd -bs $(PACKAGE).spec)
-
-rpm: srpm
-	$(srcdir)/packaging/rpmbuild-cwd --rebuild packaging/$(PKG_VER)*.src.rpm
-
-buildinstall: rpm
-	sudo yum localinstall $(PKG_VER)*.src.rpm
-
diff --git a/packaging/Makefile.dist-packaging b/packaging/Makefile.dist-packaging
new file mode 100644
index 00000000..103b1e8c
--- /dev/null
+++ b/packaging/Makefile.dist-packaging
@@ -0,0 +1,33 @@
+# -*- mode: Makefile -*-
+
+GITREV = $$(git describe --always --tags)
+GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
+
+srcdir=$(shell pwd)
+PACKAGE=ostree
+
+PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG)
+
+dist-snapshot:
+	set -x; \
+	echo "PACKAGE=$(PACKAGE)"; \
+	TARFILE_TMP=$(PKG_VER).tar.tmp; \
+	echo "Archiving $(PACKAGE) at $(GITREV)"; \
+	(cd ..; git archive --format=tar --prefix=$(PKG_VER)/ $(GITREV)) > $${TARFILE_TMP}; \
+	(cd $$(git rev-parse --show-toplevel); git submodule status) | while read line; do \
+	  rev=$$(echo $$line | cut -f 1 -d ' '); path=$$(echo $$line | cut -f 2 -d ' '); \
+	  echo "Archiving $${path} at $${rev}"; \
+	  (cd $(srcdir)/$$path; git archive --format=tar --prefix=$(PKG_VER)/$$path/ $${rev}) > submodule.tar; \
+	  tar -A -f $${TARFILE_TMP} submodule.tar; \
+	  rm submodule.tar; \
+	done; \
+	mv $(PKG_VER).tar{.tmp,}; \
+	rm -f $(PKG_VER).tar.xz; \
+	xz $(PKG_VER).tar 
+
+srpm: dist-snapshot
+	 sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > $(PACKAGE).spec; \
+	 ./rpmbuild-cwd -bs $(PACKAGE).spec
+
+rpm: srpm
+	$(srcdir)/rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm